From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 1 Mar 2018 14:09:38 +0000 (+0100)
Subject: libxc: really tolerate empty PV records
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~499
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=f593747666677c4c1e2e250329c64956b732e61f;p=xen.git

libxc: really tolerate empty PV records

Commit 119ee4d773 ("tools/libxc: Tolerate specific zero-content records
in migration v2 streams") meant tolerate those, but failed to set rc
accordingly.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c
index ed0fd0ead9..d81dfdcca6 100644
--- a/tools/libxc/xc_sr_restore_x86_pv.c
+++ b/tools/libxc/xc_sr_restore_x86_pv.c
@@ -770,6 +770,7 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx,
     {
         DBGPRINTF("Skipping empty %s record for vcpu %u\n",
                   rec_type_to_str(rec->type), vhdr->vcpu_id);
+        rc = 0;
         goto out;
     }